Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Fix integration test #124

Merged
cecton merged 38 commits into from
Jul 23, 2020
Merged

Fix integration test #124

cecton merged 38 commits into from
Jul 23, 2020

Conversation

@cecton
Copy link
Contributor

@cecton cecton commented Jun 23, 2020

Fixes #108

cecton added 6 commits June 15, 2020 12:45
@cecton
Initial commit
2949849 
Forked at: 8b1fd65
Parent branch: origin/master
@cecton
Change branch
8672ca5
@cecton
WIP
b3eed66 
Forked at: 8b1fd65
Parent branch: origin/master
@cecton
WIP
e960f56 
Forked at: 8b1fd65
Parent branch: origin/master
@cecton
WIP
54f9db5 
Forked at: 8b1fd65
Parent branch: origin/master
@cecton
WIP
bb244ab 
Forked at: 8b1fd65
Parent branch: origin/master
@cecton cecton added A3-inprogress B0-silent Changes should not be mentioned in any release notes labels Jun 23, 2020
@cecton cecton self-assigned this Jun 23, 2020
cecton added 2 commits June 23, 2020 10:46
@cecton
CLEANUP
b32f136 
Forked at: 8b1fd65
Parent branch: origin/master
@cecton
WIP
98479fd 
Forked at: 8b1fd65
Parent branch: origin/master
@cecton cecton force-pushed the cecton-fix-int-test-3 branch from afc9ffa to 98479fd Compare June 23, 2020 10:29
cecton added 18 commits June 23, 2020 13:03
@cecton
WIP
3342c2e 
Forked at: 8b1fd65
Parent branch: origin/master
@cecton
WIP
cbc7479 
Forked at: 8b1fd65
Parent branch: origin/master
@cecton
WIP
4dc2222 
Forked at: 8b1fd65
Parent branch: origin/master
@cecton
WIP
614bfaf 
Forked at: 8b1fd65
Parent branch: origin/master
@cecton
WIP
24eced7 
Forked at: 8b1fd65
Parent branch: origin/master
@cecton
Merge remote-tracking branch 'origin/master' into cecton-fix-int-test-3
f163df5
@cecton
Switch substrate branch to cumulus-branch
d00411a
@cecton
WIP
1ee7240 
Forked at: 8b1fd65
Parent branch: origin/master
@cecton
WIP
eb996e0 
Forked at: 8b1fd65
Parent branch: origin/master
@cecton
change branch
4278565
@cecton
adapt code
d8b2855
@cecton
Merge commit 82db23f (conflicts)
ea8e3f0 
Parent branch: origin/master
Forked at: 8b1fd65
@cecton
Merge commit 5cac590 (no conflict)
51183c9 
Parent branch: origin/master
Forked at: 8b1fd65
@cecton
Merge commit 416c970 (conflicts)
6ad5d6b 
Parent branch: origin/master
Forked at: 8b1fd65
@cecton
Merge commit 03205eb (conflicts)
87650dd 
Parent branch: origin/master
Forked at: 8b1fd65
@cecton
adapt code
0ab83a5
@cecton
Update branches
b405a22
@cecton
adapt code
9b4a31b
@cecton
Copy link
Contributor Author

cecton commented Jul 9, 2020

The test is working. I just need to clean-up 😃

cecton added 8 commits July 10, 2020 11:01
@cecton
CLEANUP
eaaf7a9 
Forked at: 8b1fd65
Parent branch: origin/master
@cecton
replace asyncstd by tokio
d186bfb
@cecton
CLEANUP
533b879 
Forked at: 8b1fd65
Parent branch: origin/master
@cecton
CLEANUP
aaef29d 
Forked at: 8b1fd65
Parent branch: origin/master
@cecton
CLEANUP
712f428 
Forked at: 8b1fd65
Parent branch: origin/master
@cecton
CLEANUP
2deb133 
Forked at: 8b1fd65
Parent branch: origin/master
@cecton
fmt
8c16c1b
@cecton
CLEANUP
ea1ff8e 
Forked at: 8b1fd65
Parent branch: origin/master
@cecton cecton marked this pull request as ready for review July 10, 2020 11:48
@cecton cecton requested a review from bkchr July 10, 2020 11:48
@cecton
CLEANUP
792faca 
Forked at: 8b1fd65
Parent branch: origin/master
bkchr
bkchr reviewed Jul 10, 2020
View reviewed changes
test/parachain/src/integration_test.rs Outdated

// create and sign transaction
let wasm = fs::read(target_dir().join(
"wbuild/cumulus-test-parachain-runtime/cumulus_test_parachain_runtime.compact.wasm",
Copy link
Member

@bkchr bkchr Jul 10, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope ;)

Please import the runtime and use the WASM_BINARY directly. This is the reason this constant exists.

Copy link
Contributor Author

@cecton cecton Jul 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, ok great!

Copy link
Contributor Author

@cecton cecton Jul 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

test/parachain/src/integration_test.rs Outdated

// Adapted from
// https://github.com/rust-lang/cargo/blob/485670b3983b52289a2f353d589c57fae2f60f82/tests/testsuite/support/mod.rs#L507
fn target_dir() -> PathBuf {
Copy link
Member

@bkchr bkchr Jul 10, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can be deleted.

Copy link
Contributor Author

@cecton cecton Jul 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

obviously

Copy link
Contributor Author

@cecton cecton Jul 14, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

test/parachain/src/integration_test.rs Outdated
let t2 = async {
let para_id = ParaId::from(100);

future::join(alice.wait_for_blocks(2_usize), bob.wait_for_blocks(2_usize)).await;
Copy link
Member

@bkchr bkchr Jul 10, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
future::join(alice.wait_for_blocks(2_usize), bob.wait_for_blocks(2_usize)).await;
future::join(alice.wait_for_blocks(2), bob.wait_for_blocks(2)).await;

Copy link
Contributor Author

@cecton cecton Jul 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

test/parachain/src/integration_test.rs
pin_mut!(t1, t2);

select! {
_ = t1 => {
Copy link
Member

@bkchr bkchr Jul 10, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general this is something that could be moved to polkadot-test-service as helper function. Especially the generation of t1.

Copy link
Contributor Author

@cecton cecton Jul 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤔 you mean to substrate no? I could probably make a macro to will also handle the runtime using tokio like tokio::test but substrate::test (will do async + timeout for the test)

Copy link
Contributor Author

@cecton cecton Jul 22, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made this PR to address this: paritytech/substrate#6651

@cecton cecton mentioned this pull request Jul 14, 2020
Merged
1 task
@cecton cecton merged commit bcc6277 into master Jul 23, 2020
@cecton cecton deleted the cecton-fix-int-test-3 branch July 23, 2020 14:12
Maharacha pushed a commit to Maharacha/cumulus that referenced this pull request May 10, 2023
@clangenb
bump encointer-pallets (paritytech#124)
7ac532c 
* bump encointer-pallets

* [chain_spec] rename ceremony phase values to CamelCase
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@bkchr bkchr bkchr approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@cecton cecton

Labels

B0-silent Changes should not be mentioned in any release notes

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Fix integration test

3 participants

@cecton @bkchr